From f5660b53ae17a97dc79b65f8e377d09f2f136f37 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 28 Feb 2008 13:09:28 +0000 Subject: [PATCH] Rename struct xenkbd_position member abs_z to rel_z. Z-axis motion is relative, not absolute. From: Markus Armbruster Signed-off-by: Keir Fraser --- tools/ioemu/hw/xenfb.c | 8 +++++--- xen/include/public/io/kbdif.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c index e2f181126e..3594e2f43e 100644 --- a/tools/ioemu/hw/xenfb.c +++ b/tools/ioemu/hw/xenfb.c @@ -598,7 +598,8 @@ static int xenfb_send_key(struct xenfb *xenfb, bool down, int keycode) } /* Send a relative mouse movement event */ -static int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y, int rel_z) +static int xenfb_send_motion(struct xenfb *xenfb, + int rel_x, int rel_y, int rel_z) { union xenkbd_in_event event; @@ -612,7 +613,8 @@ static int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y, int rel_ } /* Send an absolute mouse movement event */ -static int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y, int abs_z) +static int xenfb_send_position(struct xenfb *xenfb, + int abs_x, int abs_y, int rel_z) { union xenkbd_in_event event; @@ -620,7 +622,7 @@ static int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y, int ab event.type = XENKBD_TYPE_POS; event.pos.abs_x = abs_x; event.pos.abs_y = abs_y; - event.pos.abs_z = abs_z; + event.pos.rel_z = rel_z; return xenfb_kbd_event(xenfb, &event); } diff --git a/xen/include/public/io/kbdif.h b/xen/include/public/io/kbdif.h index 7b4e404335..e1d66a5107 100644 --- a/xen/include/public/io/kbdif.h +++ b/xen/include/public/io/kbdif.h @@ -65,7 +65,7 @@ struct xenkbd_position uint8_t type; /* XENKBD_TYPE_POS */ int32_t abs_x; /* absolute X position (in FB pixels) */ int32_t abs_y; /* absolute Y position (in FB pixels) */ - int32_t abs_z; /* absolute Z position (wheel) */ + int32_t rel_z; /* relative Z motion (wheel) */ }; #define XENKBD_IN_EVENT_SIZE 40 -- 2.30.2